Autogenerated HTML docs for v1.7.3.1-120-g38a18
diff --git a/git-cat-file.html b/git-cat-file.html index 11578ed..0cb6590 100644 --- a/git-cat-file.html +++ b/git-cat-file.html
@@ -343,7 +343,7 @@ <p> The name of the object to show. For a more complete list of ways to spell object names, see - the "SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(1)</a>. + the "SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>. </p> </dd> <dt> @@ -466,7 +466,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:35 UTC +Last updated 2010-10-14 04:35:14 UTC </div> </div> </body>
diff --git a/git-cat-file.txt b/git-cat-file.txt index a3f56b0..544ba7b 100644 --- a/git-cat-file.txt +++ b/git-cat-file.txt
@@ -27,7 +27,7 @@ <object>:: The name of the object to show. For a more complete list of ways to spell object names, see - the "SPECIFYING REVISIONS" section in linkgit:gitrevisions[1]. + the "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. -t:: Instead of the content, show the object type identified by
diff --git a/git-check-ref-format.html b/git-check-ref-format.html index ab31c8b..12bf187 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html
@@ -386,7 +386,7 @@ <div class="para"><p>These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used unquoted (by mistake), and also avoids ambiguities in certain -reference name expressions (see <a href="gitrevisions.html">gitrevisions(1)</a>):</p></div> +reference name expressions (see <a href="gitrevisions.html">gitrevisions(7)</a>):</p></div> <div class="olist"><ol> <li> <p> @@ -454,7 +454,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:36 UTC +Last updated 2010-10-14 04:35:14 UTC </div> </div> </body>
diff --git a/git-check-ref-format.txt b/git-check-ref-format.txt index f5c2e06..205d83d 100644 --- a/git-check-ref-format.txt +++ b/git-check-ref-format.txt
@@ -49,7 +49,7 @@ These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used unquoted (by mistake), and also avoids ambiguities in certain -reference name expressions (see linkgit:gitrevisions[1]): +reference name expressions (see linkgit:gitrevisions[7]): . A double-dot `..` is often used as in `ref1..ref2`, and in some contexts this notation means `{caret}ref1 ref2` (i.e. not in diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 06d2832..e5af23a 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html
@@ -338,7 +338,7 @@ <p> Commits to cherry-pick. For a more complete list of ways to spell commits, see - <a href="gitrevisions.html">gitrevisions(1)</a>. + <a href="gitrevisions.html">gitrevisions(7)</a>. Sets of commits can be passed but no traversal is done by default, as if the <em>--no-walk</em> option was specified, see <a href="git-rev-list.html">git-rev-list(1)</a>. @@ -529,7 +529,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:36 UTC +Last updated 2010-10-14 04:35:15 UTC </div> </div> </body>
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 2cef579..3c96fa8 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt
@@ -21,7 +21,7 @@ <commit>...:: Commits to cherry-pick. For a more complete list of ways to spell commits, see - linkgit:gitrevisions[1]. + linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the '--no-walk' option was specified, see linkgit:git-rev-list[1].
diff --git a/git-diff.html b/git-diff.html index 4d3e913..dc9ff4a 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -338,9 +338,9 @@ further add to the index but you still haven't. You can stage these changes by using <a href="git-add.html">git-add(1)</a>. </p> -<div class="para"><p>If exactly two paths are given, and at least one is untracked, -compare the two files / directories. This behavior can be -forced by --no-index.</p></div> +<div class="para"><p>If exactly two paths are given and at least one points outside +the current repository, <em>git diff</em> will compare the two files / +directories. This behavior can be forced by --no-index.</p></div> </dd> <dt> <em>git diff</em> [--options] --cached [<commit>] [--] [<path>…] @@ -400,14 +400,15 @@ </dl></div> <div class="para"><p>Just in case if you are doing something exotic, it should be noted that all of the <commit> in the above description, except -for the last two forms that use ".." notations, can be any -<tree-ish>.</p></div> +in the last two forms that use ".." notations, can be any +<tree>. The third form (<em>git diff <commit> <commit></em>) can also +be used to compare two <blob> objects.</p></div> <div class="para"><p>For a more complete list of ways to spell <commit>, see -"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(1)</a>. +"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>. However, "diff" is about comparing two _endpoints_, not ranges, and the range notations ("<commit>..<commit>" and "<commit>...<commit>") do not mean a range as defined in the -"SPECIFYING RANGES" section in <a href="gitrevisions.html">gitrevisions(1)</a>.</p></div> +"SPECIFYING RANGES" section in <a href="gitrevisions.html">gitrevisions(7)</a>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> @@ -1722,16 +1723,12 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> -<a href="git-difftool.html">git-difftool(1)</a> -</dt> -<dd> -<p> - Show changes using common diff tools -</p> -</dd> -</dl></div> +<div class="para"><p>diff(1), +<a href="git-difftool.html">git-difftool(1)</a>, +<a href="git-log.html">git-log(1)</a>, +<a href="gitdiffcore.html">gitdiffcore(7)</a>, +<a href="git-format-patch.html">git-format-patch(1)</a>, +<a href="git-apply.html">git-apply(1)</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> @@ -1747,7 +1744,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-30 00:02:56 UTC +Last updated 2010-10-14 04:35:15 UTC </div> </div> </body> diff --git a/git-diff.txt b/git-diff.txt index 08fd409..dd1fb32 100644 --- a/git-diff.txt +++ b/git-diff.txt
@@ -23,9 +23,9 @@ further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]. + -If exactly two paths are given, and at least one is untracked, -compare the two files / directories. This behavior can be -forced by --no-index. +If exactly two paths are given and at least one points outside +the current repository, 'git diff' will compare the two files / +directories. This behavior can be forced by --no-index. 'git diff' [--options] --cached [<commit>] [--] [<path>...]:: @@ -64,15 +64,16 @@ Just in case if you are doing something exotic, it should be noted that all of the <commit> in the above description, except -for the last two forms that use ".." notations, can be any -<tree-ish>. +in the last two forms that use ".." notations, can be any +<tree>. The third form ('git diff <commit> <commit>') can also +be used to compare two <blob> objects. For a more complete list of ways to spell <commit>, see -"SPECIFYING REVISIONS" section in linkgit:gitrevisions[1]. +"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. However, "diff" is about comparing two _endpoints_, not ranges, and the range notations ("<commit>..<commit>" and "<commit>\...<commit>") do not mean a range as defined in the -"SPECIFYING RANGES" section in linkgit:gitrevisions[1]. +"SPECIFYING RANGES" section in linkgit:gitrevisions[7]. OPTIONS ------- @@ -159,8 +160,12 @@ SEE ALSO -------- -linkgit:git-difftool[1]:: - Show changes using common diff tools +diff(1), +linkgit:git-difftool[1], +linkgit:git-log[1], +linkgit:gitdiffcore[7], +linkgit:git-format-patch[1], +linkgit:git-apply[1] Author ------ diff --git a/git-fast-import.html b/git-fast-import.html index 010da1a..c6471fa 100644 --- a/git-fast-import.html +++ b/git-fast-import.html
@@ -839,7 +839,7 @@ <li> <p> Any valid Git SHA-1 expression that resolves to a commit. See - “SPECIFYING REVISIONS” in <a href="gitrevisions.html">gitrevisions(1)</a> for details. + “SPECIFYING REVISIONS” in <a href="gitrevisions.html">gitrevisions(7)</a> for details. </p> </li> </ul></div> @@ -948,6 +948,8 @@ start with double quote (<tt>"</tt>).</p></div> <div class="para"><p>If an <tt>LF</tt> or double quote must be encoded into <tt><path></tt> shell-style quoting should be used, e.g. <tt>"path/with\n and \" in it"</tt>.</p></div> +<div class="para"><p>Additionally, in <tt>040000</tt> mode, <tt><path></tt> may also be an empty string +(<tt>""</tt>) to specify the root of the tree.</p></div> <div class="para"><p>The value of <tt><path></tt> must be in canonical form. That is it must not:</p></div> <div class="ilist"><ul> <li> @@ -1657,7 +1659,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:42 UTC +Last updated 2010-10-14 04:35:15 UTC </div> </div> </body>
diff --git a/git-fast-import.txt b/git-fast-import.txt index 966ba4f..5d0c245 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt
@@ -439,7 +439,7 @@ * A complete 40 byte or abbreviated commit SHA-1 in hex. * Any valid Git SHA-1 expression that resolves to a commit. See - ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[1] for details. + ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details. The special case of restarting an incremental import from the current branch value should be written as: @@ -524,6 +524,9 @@ If an `LF` or double quote must be encoded into `<path>` shell-style quoting should be used, e.g. `"path/with\n and \" in it"`. +Additionally, in `040000` mode, `<path>` may also be an empty string +(`""`) to specify the root of the tree. + The value of `<path>` must be in canonical form. That is it must not: * contain an empty directory component (e.g. `foo//bar` is invalid),
diff --git a/git-format-patch.html b/git-format-patch.html index 2a6a21d..8b79143 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -354,7 +354,7 @@ <li> <p> Generic <revision range> expression (see "SPECIFYING - REVISIONS" section in <a href="gitrevisions.html">gitrevisions(1)</a>) means the + REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>) means the commits in the specified range. </p> </li> @@ -1081,7 +1081,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-30 00:02:57 UTC +Last updated 2010-10-14 04:35:16 UTC </div> </div> </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index df77474..9dcafc6 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -39,7 +39,7 @@ that leads to the <since> to be output. 2. Generic <revision range> expression (see "SPECIFYING - REVISIONS" section in linkgit:gitrevisions[1]) means the + REVISIONS" section in linkgit:gitrevisions[7]) means the commits in the specified range. The first rule takes precedence in the case of a single <commit>. To
diff --git a/git-log.html b/git-log.html index 28ee641..d864529 100644 --- a/git-log.html +++ b/git-log.html
@@ -350,7 +350,7 @@ either <since> or <until> is omitted, it defaults to <tt>HEAD</tt>, i.e. the tip of the current branch. For a more complete list of ways to spell <since> - and <until>, see <a href="gitrevisions.html">gitrevisions(1)</a>. + and <until>, see <a href="gitrevisions.html">gitrevisions(7)</a>. </p> </dd> <dt> @@ -2861,7 +2861,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-10-01 01:31:24 UTC +Last updated 2010-10-14 04:35:16 UTC </div> </div> </body>
diff --git a/git-log.txt b/git-log.txt index c213bdb..6d40f00 100644 --- a/git-log.txt +++ b/git-log.txt
@@ -31,7 +31,7 @@ either <since> or <until> is omitted, it defaults to `HEAD`, i.e. the tip of the current branch. For a more complete list of ways to spell <since> - and <until>, see linkgit:gitrevisions[1]. + and <until>, see linkgit:gitrevisions[7]. --follow:: Continue listing the history of a file beyond renames
diff --git a/git-push.html b/git-push.html index 2a56990..6a46bee 100644 --- a/git-push.html +++ b/git-push.html
@@ -360,7 +360,7 @@ </p> <div class="para"><p>The <src> is often the name of the branch you would want to push, but it can be any arbitrary "SHA-1 expression", such as <tt>master~4</tt> or -<tt>HEAD</tt> (see <a href="gitrevisions.html">gitrevisions(1)</a>).</p></div> +<tt>HEAD</tt> (see <a href="gitrevisions.html">gitrevisions(7)</a>).</p></div> <div class="para"><p>The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must be named. If <tt>:</tt><dst> is omitted, the same ref as <src> will be @@ -1144,7 +1144,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:52 UTC +Last updated 2010-10-14 04:35:17 UTC </div> </div> </body>
diff --git a/git-push.txt b/git-push.txt index 020955f..e11660a 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -41,7 +41,7 @@ + The <src> is often the name of the branch you would want to push, but it can be any arbitrary "SHA-1 expression", such as `master~4` or -`HEAD` (see linkgit:gitrevisions[1]). +`HEAD` (see linkgit:gitrevisions[7]). + The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must
diff --git a/git-reflog.html b/git-reflog.html index 962f03f..bf0c5dd 100644 --- a/git-reflog.html +++ b/git-reflog.html
@@ -347,7 +347,7 @@ <div class="para"><p>The reflog is useful in various git commands, to specify the old value of a reference. For example, <tt>HEAD@{2}</tt> means "where HEAD used to be two moves ago", <tt>master@{one.week.ago}</tt> means "where master used to -point to one week ago", and so on. See <a href="gitrevisions.html">gitrevisions(1)</a> for +point to one week ago", and so on. See <a href="gitrevisions.html">gitrevisions(7)</a> for more details.</p></div> <div class="para"><p>To delete single entries from the reflog, use the subcommand "delete" and specify the _exact_ entry (e.g. "<tt>git reflog delete master@{2}</tt>").</p></div> @@ -445,7 +445,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:53 UTC +Last updated 2010-10-14 04:35:18 UTC </div> </div> </body> diff --git a/git-reflog.txt b/git-reflog.txt index 5a0451a..e50bd9b 100644 --- a/git-reflog.txt +++ b/git-reflog.txt
@@ -40,7 +40,7 @@ The reflog is useful in various git commands, to specify the old value of a reference. For example, `HEAD@\{2\}` means "where HEAD used to be two moves ago", `master@\{one.week.ago\}` means "where master used to -point to one week ago", and so on. See linkgit:gitrevisions[1] for +point to one week ago", and so on. See linkgit:gitrevisions[7] for more details. To delete single entries from the reflog, use the subcommand "delete" diff --git a/git-revert.html b/git-revert.html index 68f7c64..fa370a5 100644 --- a/git-revert.html +++ b/git-revert.html
@@ -347,7 +347,7 @@ <p> Commits to revert. For a more complete list of ways to spell commit names, see - <a href="gitrevisions.html">gitrevisions(1)</a>. + <a href="gitrevisions.html">gitrevisions(7)</a>. Sets of commits can also be given but no traversal is done by default, see <a href="git-rev-list.html">git-rev-list(1)</a> and its <em>--no-walk</em> option. @@ -473,7 +473,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:55 UTC +Last updated 2010-10-14 04:35:18 UTC </div> </div> </body>
diff --git a/git-revert.txt b/git-revert.txt index b7d9ef7..f40984d 100644 --- a/git-revert.txt +++ b/git-revert.txt
@@ -31,7 +31,7 @@ <commit>...:: Commits to revert. For a more complete list of ways to spell commit names, see - linkgit:gitrevisions[1]. + linkgit:gitrevisions[7]. Sets of commits can also be given but no traversal is done by default, see linkgit:git-rev-list[1] and its '--no-walk' option.
diff --git a/git-show-branch.html b/git-show-branch.html index 8a21be7..3f272b5 100644 --- a/git-show-branch.html +++ b/git-show-branch.html
@@ -345,7 +345,7 @@ </dt> <dd> <p> - Arbitrary extended SHA1 expression (see <a href="gitrevisions.html">gitrevisions(1)</a>) + Arbitrary extended SHA1 expression (see <a href="gitrevisions.html">gitrevisions(7)</a>) that typically names a branch head or a tag. </p> </dd> @@ -612,7 +612,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:57 UTC +Last updated 2010-10-14 04:35:18 UTC </div> </div> </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt index 6453263..8dbcf1a 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt
@@ -32,7 +32,7 @@ OPTIONS ------- <rev>:: - Arbitrary extended SHA1 expression (see linkgit:gitrevisions[1]) + Arbitrary extended SHA1 expression (see linkgit:gitrevisions[7]) that typically names a branch head or a tag. <glob>::
diff --git a/git-show.html b/git-show.html index fac3b7f..abbd9ff 100644 --- a/git-show.html +++ b/git-show.html
@@ -346,7 +346,7 @@ <p> The names of objects to show. For a more complete list of ways to spell object names, see - "SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(1)</a>. + "SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>. </p> </dd> <dt> @@ -988,7 +988,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:58 UTC +Last updated 2010-10-14 04:35:18 UTC </div> </div> </body>
diff --git a/git-show.txt b/git-show.txt index 0002bfb..2049c60 100644 --- a/git-show.txt +++ b/git-show.txt
@@ -36,7 +36,7 @@ <object>...:: The names of objects to show. For a more complete list of ways to spell object names, see - "SPECIFYING REVISIONS" section in linkgit:gitrevisions[1]. + "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. include::pretty-options.txt[]
diff --git a/git-update-index.html b/git-update-index.html index 079a514..1926412 100644 --- a/git-update-index.html +++ b/git-update-index.html
@@ -564,8 +564,8 @@ </dt> <dd> <p> - Only meaningful with <tt>--stdin</tt>; paths are separated with - NUL character instead of LF. + Only meaningful with <tt>--stdin</tt> or <tt>--index-info</tt>; paths are + separated with NUL character instead of LF. </p> </dd> <dt> @@ -837,7 +837,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:00 UTC +Last updated 2010-10-14 04:35:19 UTC </div> </div> </body>
diff --git a/git-update-index.txt b/git-update-index.txt index 74d1d49..26fd8d0 100644 --- a/git-update-index.txt +++ b/git-update-index.txt
@@ -144,8 +144,8 @@ Report what is being added and removed from index. -z:: - Only meaningful with `--stdin`; paths are separated with - NUL character instead of LF. + Only meaningful with `--stdin` or `--index-info`; paths are + separated with NUL character instead of LF. \--:: Do not interpret any more arguments as options.
diff --git a/git.html b/git.html index 5a2c464..2e1bba7 100644 --- a/git.html +++ b/git.html
@@ -1743,7 +1743,7 @@ </dd> </dl></div> <div class="para"><p>For a more complete list of ways to spell object names, see -"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(1)</a>.</p></div> +"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.</p></div> </div> <h2 id="_file_directory_structure">File/Directory Structure</h2> <div class="sectionbody"> @@ -2126,7 +2126,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-30 00:02:59 UTC +Last updated 2010-10-14 04:35:21 UTC </div> </div> </body>
diff --git a/git.txt b/git.txt index dd57bdc..b46c6f6 100644 --- a/git.txt +++ b/git.txt
@@ -495,7 +495,7 @@ (i.e. the contents of `$GIT_DIR/refs/heads/<head>`). For a more complete list of ways to spell object names, see -"SPECIFYING REVISIONS" section in linkgit:gitrevisions[1]. +"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. File/Directory Structure
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 23cbff0..d45e0ee 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html
@@ -1234,7 +1234,7 @@ before the commit log message is a short name you can use to name the commit. In the above example, <em>master</em> and <em>mybranch</em> are branch heads. <em>master^</em> is the first parent of <em>master</em> -branch head. Please see <a href="gitrevisions.html">gitrevisions(1)</a> if you want to +branch head. Please see <a href="gitrevisions.html">gitrevisions(7)</a> if you want to see more complex cases.</p></div> <div class="admonitionblock"> <table><tr> @@ -2047,7 +2047,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:05 UTC +Last updated 2010-10-14 04:35:21 UTC </div> </div> </body>
diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt index 5e9c5eb..c27d086 100644 --- a/gitcore-tutorial.txt +++ b/gitcore-tutorial.txt
@@ -971,7 +971,7 @@ before the commit log message is a short name you can use to name the commit. In the above example, 'master' and 'mybranch' are branch heads. 'master^' is the first parent of 'master' -branch head. Please see linkgit:gitrevisions[1] if you want to +branch head. Please see linkgit:gitrevisions[7] if you want to see more complex cases. [NOTE]
diff --git a/gitk.html b/gitk.html index 31a0e74..b3c2394 100644 --- a/gitk.html +++ b/gitk.html
@@ -415,7 +415,7 @@ the form "<em><from></em>..<em><to></em>" to show all revisions between <em><from></em> and back to <em><to></em>. Note, more advanced revision selection can be applied. For a more complete list of ways to spell object names, see - <a href="gitrevisions.html">gitrevisions(1)</a>. + <a href="gitrevisions.html">gitrevisions(7)</a>. </p> </dd> <dt> @@ -514,7 +514,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:03 UTC +Last updated 2010-10-14 04:35:19 UTC </div> </div> </body>
diff --git a/gitk.txt b/gitk.txt index 05ac1c7..e21bac4 100644 --- a/gitk.txt +++ b/gitk.txt
@@ -69,7 +69,7 @@ the form "'<from>'..'<to>'" to show all revisions between '<from>' and back to '<to>'. Note, more advanced revision selection can be applied. For a more complete list of ways to spell object names, see - linkgit:gitrevisions[1]. + linkgit:gitrevisions[7]. <path>...::
diff --git a/user-manual.html b/user-manual.html index 055245b..b16c775 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book" title="Git User's Manual (for version 1.5.3 or newer)"><div class="titlepage"><div><div><h1 class="title"><a name="id392940"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id392950">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" title="Preface"><div class="titlepage"><div><div><h2 class="title"><a name="id392950"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book" title="Git User's Manual (for version 1.5.3 or newer)"><div class="titlepage"><div><div><h1 class="title"><a name="id415946"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id415956">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" title="Preface"><div class="titlepage"><div><div><h2 class="title"><a name="id415956"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring git history">Chapter 2, <i>Exploring git history</i></a> explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for @@ -205,7 +205,7 @@ is usually a shortcut for the HEAD branch in the repository "origin".</p><p>For the complete list of paths which git checks for references, and the order it uses to decide which to choose when there are multiple references with the same shorthand name, see the "SPECIFYING -REVISIONS" section of <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(1)</a>.</p></div><div class="section" title="Updating a repository with git fetch"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Updating-a-repository-With-git-fetch"></a>Updating a repository with git fetch</h2></div></div></div><p>Eventually the developer cloned from will do additional work in her +REVISIONS" section of <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(7)</a>.</p></div><div class="section" title="Updating a repository with git fetch"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Updating-a-repository-With-git-fetch"></a>Updating a repository with git fetch</h2></div></div></div><p>Eventually the developer cloned from will do additional work in her repository, creating new commits and advancing the branches to point at the new commits.</p><p>The command "git fetch", with no arguments, will update all of the remote-tracking branches to the latest version found in her @@ -277,7 +277,7 @@ </li><li class="listitem"> HEAD: refers to the head of the current branch </li></ul></div><p>There are many more; see the "SPECIFYING REVISIONS" section of the -<a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(1)</a> man page for the complete list of ways to +<a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(7)</a> man page for the complete list of ways to name revisions. Some examples:</p><div class="literallayout"><p>$ git show fb47ddb2 # the first few characters of the object name<br> # are usually enough to specify it uniquely<br> $ git show HEAD^ # the parent of the HEAD commit<br> @@ -378,7 +378,7 @@ refs/heads/tutorial-fixes</p></div><p>And then we can ask to see all the commits reachable from master but not from these other heads:</p><div class="literallayout"><p>$ gitk master --not $( git show-ref --heads | cut -d' ' -f2 |<br> grep -v '^refs/heads/master' )</p></div><p>Obviously, endless variations are possible; for example, to see all -commits reachable from some head but not from any tag in the repository:</p><div class="literallayout"><p>$ gitk $( git show-ref --heads ) --not $( git show-ref --tags )</p></div><p>(See <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(1)</a> for explanations of commit-selecting +commits reachable from some head but not from any tag in the repository:</p><div class="literallayout"><p>$ gitk $( git show-ref --heads ) --not $( git show-ref --tags )</p></div><p>(See <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(7)</a> for explanations of commit-selecting syntax such as <code class="literal">—not</code>.)</p></div><div class="section" title="Creating a changelog and tarball for a software release"><div class="titlepage"><div><div><h3 class="title"><a name="making-a-release"></a>Creating a changelog and tarball for a software release</h3></div></div></div><p>The <a class="ulink" href="git-archive.html" target="_top">git-archive(1)</a> command can create a tar or zip archive from any version of a project; for example:</p><div class="literallayout"><p>$ git archive --format=tar --prefix=project/ HEAD | gzip >latest.tar.gz</p></div><p>will use HEAD to produce a tar archive in which each filename is preceded by "project/".</p><p>If you're releasing a new version of a software project, you may want @@ -647,7 +647,7 @@ you've checked out.</p><p>The reflogs are kept by default for 30 days, after which they may be pruned. See <a class="ulink" href="git-reflog.html" target="_top">git-reflog(1)</a> and <a class="ulink" href="git-gc.html" target="_top">git-gc(1)</a> to learn how to control this pruning, and see the "SPECIFYING REVISIONS" -section of <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(1)</a> for details.</p><p>Note that the reflog history is very different from normal git history. +section of <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(7)</a> for details.</p><p>Note that the reflog history is very different from normal git history. While normal history is shared by every repository that works on the same project, the reflog history is not shared: it tells you only about how the branches in your local repository have changed over time.</p></div><div class="section" title="Examining dangling objects"><div class="titlepage"><div><div><h4 class="title"><a name="dangling-object-recovery"></a>Examining dangling objects</h4></div></div></div><p>In some situations the reflog may not be able to save you. For example, @@ -863,8 +863,11 @@ EOF</p></div><p>Then you can push both the test and release trees using <a class="ulink" href="git-push.html" target="_top">git-push(1)</a>:</p><div class="literallayout"><p>$ git push mytree</p></div><p>or push just one of the test and release branches using:</p><div class="literallayout"><p>$ git push mytree test</p></div><p>or</p><div class="literallayout"><p>$ git push mytree release</p></div><p>Now to apply some patches from the community. Think of a short snappy name for a branch to hold this patch (or related group of -patches), and create a new branch from the current tip of Linus's -branch:</p><div class="literallayout"><p>$ git checkout -b speed-up-spinlocks origin</p></div><p>Now you apply the patch(es), run some tests, and commit the change(s). If +patches), and create a new branch from a recent stable tag of +Linus's branch. Picking a stable base for your branch will: +1) help you: by avoiding inclusion of unrelated and perhaps lightly +tested changes +2) help future bug hunters that use "git bisect" to find problems</p><div class="literallayout"><p>$ git checkout -b speed-up-spinlocks v2.6.35</p></div><p>Now you apply the patch(es), run some tests, and commit the change(s). If the patch is a multi-part series, then you should apply each as a separate commit to this branch.</p><div class="literallayout"><p>$ ... patch ... test ... commit [ ... patch ... test ... commit ]*</p></div><p>When you are happy with the state of this change, you can pull it into the "test" branch in preparation to make it public:</p><div class="literallayout"><p>$ git checkout test && git pull . speed-up-spinlocks</p></div><p>It is unlikely that you would have any conflicts here … but you might if you
diff --git a/user-manual.txt b/user-manual.txt index ce45bfc..77eb483 100644 --- a/user-manual.txt +++ b/user-manual.txt
@@ -397,7 +397,7 @@ For the complete list of paths which git checks for references, and the order it uses to decide which to choose when there are multiple references with the same shorthand name, see the "SPECIFYING -REVISIONS" section of linkgit:gitrevisions[1]. +REVISIONS" section of linkgit:gitrevisions[7]. [[Updating-a-repository-With-git-fetch]] Updating a repository with git fetch @@ -568,7 +568,7 @@ - HEAD: refers to the head of the current branch There are many more; see the "SPECIFYING REVISIONS" section of the -linkgit:gitrevisions[1] man page for the complete list of ways to +linkgit:gitrevisions[7] man page for the complete list of ways to name revisions. Some examples: ------------------------------------------------- @@ -909,7 +909,7 @@ $ gitk $( git show-ref --heads ) --not $( git show-ref --tags ) ------------------------------------------------- -(See linkgit:gitrevisions[1] for explanations of commit-selecting +(See linkgit:gitrevisions[7] for explanations of commit-selecting syntax such as `--not`.) [[making-a-release]] @@ -1635,7 +1635,7 @@ The reflogs are kept by default for 30 days, after which they may be pruned. See linkgit:git-reflog[1] and linkgit:git-gc[1] to learn how to control this pruning, and see the "SPECIFYING REVISIONS" -section of linkgit:gitrevisions[1] for details. +section of linkgit:gitrevisions[7] for details. Note that the reflog history is very different from normal git history. While normal history is shared by every repository that works on the @@ -2171,11 +2171,14 @@ Now to apply some patches from the community. Think of a short snappy name for a branch to hold this patch (or related group of -patches), and create a new branch from the current tip of Linus's -branch: +patches), and create a new branch from a recent stable tag of +Linus's branch. Picking a stable base for your branch will: +1) help you: by avoiding inclusion of unrelated and perhaps lightly +tested changes +2) help future bug hunters that use "git bisect" to find problems ------------------------------------------------- -$ git checkout -b speed-up-spinlocks origin +$ git checkout -b speed-up-spinlocks v2.6.35 ------------------------------------------------- Now you apply the patch(es), run some tests, and commit the change(s). If
